(fs_load_font): Don't set fontp->font_encoder to NULL

before calling find_ccl_program_func.  Call find_ccl_program_func
only when fontp->font_encoder is not NULL.

diff --git a/src/fontset.c b/src/fontset.c
index 996631f1a59d9f109d5f202125d2641f3cf406b7..990c1bbb9fa5f8392b451902ceea1bea90c1f164 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -690,9 +690,7 @@ fs_load_font (f, c, fontname, id, face)
        }
     }
 
-  fontp->font_encoder = (struct ccl_program *) 0;
-
-  if (find_ccl_program_func)
+  if (! fontp->font_encoder && find_ccl_program_func)
     (*find_ccl_program_func) (fontp);
 
   /* If we loaded a font for a face that has fontset, record the face